jira: no-jira Change-Id: If9e698d60b71e8835a3ae46c75e9c8c2878556a7 (cherry picked from commit a2b2ec9cb80e3bafabd07a377aff9e11188be346) (cherry picked from commit 201d3b18cc9d482192c9962717527f9e12ed6603)
jira: none Change-Id: I8bc5d4a1eea116305037b8194ff1d2e8aab83ce9 (cherry picked from commit 7df9f9d27d174b30a54ed27756d4a4a157557019) (cherry picked from commit b97d44dae4854c342b835d3fd5265a22aec5d174)