Merge changes Id16ea475,I38997710 am: 9da84f472f
am: 2f95509942

Change-Id: I1dbdb2ae4f3ede1d00b3533135e781fef01028de