A few resuming from backend comment adjustments

Change-Id: I40d8c1926b4bef337eaaf0adc6cae66d023dc200
Merge "A few resuming from backend comment adjustments"