resolved conflicts for merge of 4d9a8556 to honeycomb-plus-aosp

Change-Id: I3914339049e3d302f8542d8ea305905eec480bbb