Clean up the use of isBeta()

Change-Id: I7beae39037745e3d9e11950c78424ec4c28ade97
Merge "Clean up the use of isBeta()"