am 95903a86: am a358badf: Merge d4b7315d551cc8a930c88e27ba623b3ac38f196a to mnc-dev-plus-aosp to fix build.

* commit '95903a86bf827a09d9bc7780a6e3b882745bd201':