Merge commit 'b94941d0' into manual_merge_b94941d Bug:29625414 Change-Id: Iab1b6d2cdf29fd45fae953626271efc2c4d5635d