Change-Id: Id9af601c00fc87f861adeed9f5aa99a3dc55b17e (cherry picked from commit 768e4c952f335a825cd45b102556d5948ed09d0c)