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
Change-Id: I194fe4001661bfe0f0a47c70ed17aea0793e79b8