Merge "Merge "Make items in Advanced battery page unclickable." into oc-dr1-dev am: 3a9734261d am: 593049c1d4"