Bug: 35364993 Test: Ran amended ViewAttributesTest Change-Id: Ib7d2c3dfd5b4a6b638b56c4583af4c9bdf37e346