Merge "DO NOT MERGE: Add radio state condition for high power indications"