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

Change-Id: I1fa56eef94ac1a5108303bc93b3a32ac48ec9e94