[automerger] Merge commit 'a46868fc' into manual_merge_a46868fca645ed193ec15c6790ccb970dd81d495 am: 56c853f8 am: b0b33572 Change-Id: Ia937f834cd08b0a4523aaefef36a2293b964b21f