jira: 8816 Change-Id: I7df5676ecc80c27b516f47efe00ac40d04a4a5c9 (cherry picked from commit 13a4edc97c5ba0fc5f8a0a7263608597ce923548)
jira: 8816 Change-Id: I7df5676ecc80c27b516f47efe00ac40d04a4a5c9 (cherry picked from commit 13a4edc97c5ba0fc5f8a0a7263608597ce923548)