Merge changes from topic "wait_for_merge"
am: 18c6248ffe

Change-Id: Ibccf63cfdaabb8610c24d2b2271d7cb3cda016f2