Merge changes Id3bbd918,I852b069e
am: 8c1246deaf

Change-Id: I3bef202530ff10465d9a3695337e6011cd3da243