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

Change-Id: Ieac34e2de3334f66b99e50b88e1d51adbb649603