Merge changes from topic 'am-b01079a28be1492382951291689043df' into marshmallow-cts-dev
am: c810851608

Change-Id: I3e109a6f6be98779b9191e67ea4dd7cfcbb7aec5