[automerger] Merge changes from topic "am-152b0310159c4cd6bf8d7e87c98040d9" into mnc-dr1.5-dev am: b473d8251e am: 96c1d6df9f am: 7a3d5521d8 am: 0d37dc5008 am: aca8ca2f5b am: ebd8d36a4c am: 31983fdfec
am: 429936a511

Change-Id: I1d8a4a7ffcadb83609bc7f55bdfe0ad979a4a8da