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

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