Replace remaining sajax use

Bug: 40785
Change-Id: I4a0af8986f924cd127a73828e72da6998f28536c