Merge changes from topic 'minui_sync_wait' am: 9cd828b858 am: 70f9a1018c
am: d13fbda554

Change-Id: I56a2aea191478870899c0a8aadffa19f4e55f4b5