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

Change-Id: Iaa16443a00f5c88831f1efd6a104f8d80a27cd1b