046ac5e6f7
These changes are made to make the API check in mwd-staging happy. It doesn't look like they are needed in master branch; so marking them as DO NOT MERGE. Change-Id: I45363165b6a8ffe896cf9a31c0b3cb410aa69cba