Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp" am: f59720c6b8
am: 944d14c473

Change-Id: I6ab20b77cc91a39e406b68fa45977b5c60b35ee7