Merge "Treat named standby states as ceilings of behavioral categories" into pi-dev
am: f3015eb0df

Change-Id: I10e1114a4619c65c78d9177800ffe04b80039228