Merge commit '8b1c13424270cbe4f0b6bc426f0ff80888b87114' into manual_merge_8b1c13424270cbe4f0b6bc426f0ff80888b87114 am: d85a75b72d
am: 431ecaf792

Change-Id: Id2d8f9a0356f7e3bfd23db4640798a56ff0f769c