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

Change-Id: Ib58f03f7346aa706508d9dc082c9661865478485