Merge from honeycomb-plus-aosp

Change-Id: I3a3e2adce3114fb86c8fc4d2af48f1daa7340f6b