resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp

Change-Id: If8fbbd51232fd01a481cb47df426de169c0c830c