Merge changes I096b7c98,I1d7f46cc am: 50e9c3a684
am: 772a5baddf

Change-Id: Icf8f68d76eddb2b7ccd8ca9d18f0538083c815f0