Merge "API review comments Test: make Bug: b/150126235" into rvc-dev am: 66a3e599 am: b2344a53 am: f790f237 Change-Id: Ibb77a3f3d8e5a152a8986c831b87b347d3b85b49