Merge changes I52729c45,Ia6cc29c4,I90da4789
am: f98533e549

Change-Id: I6fab3367577188a0c75ccc9e51a89f90cfb5dedf