Merge remote-tracking branch 'origin/upstream' am: 1cbda32f30 am: 9ca3431993

Original change: undetermined

Change-Id: I17f194f5d05fe8eaed871567555fd7cace87e72c
Signed-off-by: Automerger Merge Worker <[email protected]>