resolved conflicts for merge of ac304133 to lmp-dev-plus-aosp

Change-Id: I6886aa3f4066eead9242eb77042d89c4ee28da1b