Merge changes from topic "wait_for_merge" am: 18c6248ffe am: 0cd761c347

Change-Id: I94926735065f616ccf542025fd04c8673b528b09