Merge "Apply full_treble_only to whole rule." am: 0fa0d1e596 am: 4aa78f8054
am: e9f70f7c35

Change-Id: I627802b54da2cb9e4bd7265f50ea78a0ce3bb7c6