resolved conflicts for merge of 854354be to honeycomb-plus-aosp

Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f