Replace deprecated assembly op code. am: ffb56c065b am: 2b4cc3ddec
am: 1feb191f66

Change-Id: I339bddd8808ddb7adb26d549b508aae1980833aa