Merge changes I63b5e69b,I85c6af63 am: a800e1ee9d am: e37779bfea am: 0878661083

Change-Id: Ia249cbfbf7c65e09d3655c9fefc8ad41d14863b1