Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1
am: 235e342639

Change-Id: I9ed2530dd33c231db92f6e10dcea8b2baaba123f