Merge changes I5e14eeb1,I0bcf0516
am: 77b32a9cb9

Change-Id: If5f3696d3050929da651e0fcb177027654d302fa