Merge changes from topic "am-df77b614140440a9aca0e4b8a4a83d73" into marshmallow-cts-dev
am: 1c92fba1a9

Change-Id: Ic1e94cf87bd0cf722ba1212ae0251d3c06f93f73