Merge cherrypicks of [20075471, 20075472, 20075473, 20075474, 20091711, 20091712, 20091713, 20091714] into rvc-wear-jr2-dr-r11-release.

Change-Id: Idac29e1ab8bf0bf085ec3573a61f4da6d6dbab7f