Merge changes from topic 'minui_sync_wait'
am: 9cd828b858

Change-Id: Ib4d2c4dc6d6f2d78a99fccf57fc055f8934a8312