Merge "Avoid reverting apex on devices that do not support updating apex" into...
Merge "Avoid reverting apex on devices that do not support updating apex" into rvc-dev am: d8b6b0fb am: 28153caf am: 28ea7f20 am: dc6a18b3
Change-Id: I6dd770c4e5a014ce2b3b0a82a892a34050db54ca