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