Merge remote-tracking branch 'origin/upstream' am: 3fba44c118 am: d8b29a196a

Original change: undetermined

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