Merge changes Id0d167e6,I290a02b0 am: 90573e75a8
am: 9efa174836

Change-Id: I2dc62da1b90c68a0ae53333f063e3684619e9cbf