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

Change-Id: I8a851ef4819cdf3c47d1660de66f9401b71dd357