Merge changes I668f5351,I40fa767b
am: 6743f1ebd4

Change-Id: I1bc3791f9f30b00cdf7daa625895d13f3a26d0f8