Cherry pick of 1142960

This also updates the comments in line with API review
Bug:29513788

Change-Id: I8c5efc3236c33affa0c2b80277a025b6a8b4d945
2 files changed