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

Change-Id: Ifd99004890da01f89c4012645bb42a06f0cbb28a