Merge changes from topic 'ndk-r13' am: fe5ff1a6d5
am: d8457de825

Change-Id: I833f6d09a6d31e2d8e87c418a978a9b86ce7e077