Change-Id: I411a7e26f536a1e4924f566a2ecba097fc134db2 (cherry picked from commit 24271e34) (cherry picked from commit 10b190ee)