am 6519756b: Merge "DO NOT MERGE Cherry-pick of 0ee092fb2 from master" into honeycomb

* commit '6519756b23a8b18d06dae53cc3ece32c87146972':
  DO NOT MERGE Cherry-pick of 0ee092fb2 from master