Merge changes Id598ae1d,I475bd011
am: 1ad99fb064

Change-Id: Ic02f8d900b6b430dc1a8bbfdc03297ad52157390