jira: [none] Change-Id: I368b72fc745fe9b7858782a9d87a6a896a72acce (cherry picked from commit e2dbd4fccef53588242b0fff704e28552cfaac83)