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

Change-Id: I60393afc06063d49d2b01a74571ddad4bd0a6ede