Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb