Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dev
am: c17b510a15

Change-Id: I07e52bccb5178319f753f243f41a7522d7535eb7