Merge changes from topic "am-a0a1f3414b9a4b419037551f894343bc" into mnc-dr1.5-dev
am: a5c3676d9f

Change-Id: Iacc37b5a3bc7ddfabfad0b9aa7f9214ce3cf1b72