Merge "Consolidate the vendor space misc usage for Pixels" am: 423f0d109b
am: 85808f6a69

Change-Id: I52ea38012af730ad58426e9238b6a5d59184ac29