Merge changes I93b4210f,Ifdc1d4fd
am: 92803eeb32

Change-Id: Ie22d9a87535c6a4948addfc965732f3839467134