resolve merge conflicts of 6c8cab115 to stage-aosp-master am: 71f6de410f
am: 812dfcd269

Change-Id: Ice863ef7745fcfcbd06affd501d79325d3f6c52f