am 9c0bd864: Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb

* commit '9c0bd864a302ac2a8cb826c3c8d2f0d0ce6f2406':
  Review rework on Patch Set 2 for issue 3372849