Reconcile with honeycomb-mr2-release

Change-Id: I67bdc33aeb248a10c08e1a9bbc1938101304f29d