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

Change-Id: I3d21c99c3300cf481e4142d313102e061d5b22de