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

* commit 'a358badf0266d5188b86aecdcf4f33e0d4491ae1':