resolved conflicts for merge of b40ebc54 to mnc-dev-plus-aosp

Change-Id: I9da05b46da2326ae21d164b137be57a9b5220f7b