Merge remote-tracking branch 'origin/upstream' am: dfcf9c9ec5

Original change: undetermined

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