Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926
am: 2596931e86

Change-Id: I3084760ec275de17fa024379decf98303799e213