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

Change-Id: Ic2e376f3998d754d7e186d7cf82dcb1433b34203