resolved conflicts for merge of 79705f99 to lmp-dev-plus-aosp

Change-Id: I6a87d6f2364ba3ac86d13faaf161dcc65990e4bb