tree cfd32c9b5b05ce5d212b40c6b0c8246e0e55a6ff
parent 0019e53e11b5387dbb037db52ff4833fe58cc651
author Vinit Deshpande <vinitd@google.com> 1425689520 -0800
committer Vinit Deshpande <vinitd@google.com> 1425952929 -0700

Few changes to make API check happy [DO NOT MERGE]

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