resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf