jira: NONE Change-Id: I221eb4167dad894c9e7f32141d33c5c96934df96 (cherry picked from commit 065c8d029eb9df4deb85ce22fe41896fa7c2a883)