Merge changes I80504f43,Ifc372eef am: de7be840a7 am: 991da81069
am: 74964ffb8a  -s ours

Change-Id: Ib31d864dd8ba45c2489b527ea095d69d3a4b456b