Merge remote-tracking branch 'origin/upstream' am: 74bce3073c

Original change: undetermined

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