Merge changes If868f090,I3b7c39c4,I0c2152ed,I79796636,I6dc87bac, ... into mnc-ub-dev
am: 171a1c2

* commit '171a1c25467619af7a9268975d9b742914dc0bd6':

Change-Id: Iad7ca4e11e1fbe24b72ca74d816c83dedac4caf0