Change-Id: Iac825646e33cb40f7d8a1c1aa6a3e67f3aac5980 (cherry picked from commit aa2886cf) (cherry picked from commit b16be656)