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

Change-Id: I293fcb31472db3d2aaa91df7ec17b0e5e8f6e461