Merge changes I99d46a2c,I6ff460d0 am: ef9835967a am: 45415605b6
am: 006723f1dc

Change-Id: Ic69bf22b21b045b14be13390ff09668937a41a4a