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