Transition for non-compatible apps will be handled in a separate CL. Change-Id: I9c474f7aa394e4f3eacd1845c78bee5874bd8a59