Merge changes Id3a9ce45,I4eddd1a3
am: 7da6f1d3d8

Change-Id: I233137b9df32457a070b146ab2e65441826aa3e8