Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp"