jira:[none] Change-Id: Ia59bb1bb606399541aa191991ff0fb3f106d75d1 (cherry picked from commit b22af6cfe0a589ae5fa2e95a01ebe47f6742ee99)