resolved conflicts for merge of 5e9ab711 to jb-dev-plus-aosp

Change-Id: I0ea465b274d208f6731f04069802e0684690d3c7