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

Change-Id: Id409cd89c262cb8b64b1141dfa6576f59786271c