Merge changes from topic 'minui-cherrypick' am: d6137a2ae0
am: 38236d0f35

Change-Id: Ie197bb6e5ef67732be162c9cd2edb696576530d1