(cherry-picked from commit 30cbe3b264) Change-Id: I1264733705d58243e0ff4d001f3802ad48de0b09
30cbe3b264