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

Change-Id: Ie1d550d4dcb0123db423f1625d4489e16befe580