Merge "Remove new styles from AOSP" into rvc-d1-dev am: dbe16101a5

Change-Id: I75fe26d6d6297b345f167052b84b08da25ead5ea