API change - bug 3370353 and bug 3370338

Change-Id: I9da53f3260ca17713e793b420e477686ad23c7d3
4 files changed