Review rework on Patch Set 2 for issue 3372849

Change-Id: I3c077f3318e44035e8ea6eb160d0024e77aaa710
2 files changed