Merge changes I046b41af,I3b230eae,I26496f0b
am: 1c7a01d072

Change-Id: Iade3b7ff947e7f7f1b950927c7f0319674be8684