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

Change-Id: I9e36ad01b19bca0e7c9888cb597c3331b9538e07