API review fixes

BUG: 30088092
BUG: 30088343

Change-Id: I3abc24bd5f7876ff12b42f13a579399123d50470
5 files changed