Merge changes I1c50546e,I8254cb6b,Ib179299a,Iec1c2801 am: 2374693556
am: 770b2347cf

Change-Id: Ibc1959523ea0d2bd8ebf2f4de79cab46fbae86d0