Merge changes from topic "hiddenCameraDeadlock" am: c52243f298 am: 8863a154f8
am: f7b975c56a

Change-Id: Ic18b113e58e15d24ea212a42d7275df32cbd5915