Merge changes I87f14bf1,Idc21bf89
am: f6362521be

Change-Id: Ie5a8dc484a24612110c64cf57fc206bf0c793f9d