Merge cherrypicks of [14947191, 14947212, 14947132, 14947133, 14947450, 14947331] into security-aosp-oc-mr1-release

Change-Id: I026cfbb8f34ec1926505da3eea635c9380667c32