DO NOT MERGE
cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29

Change-Id: Ia5150288ce6fe57460159dd7555c6786023b1d9e
7 files changed