Replace deprecated assembly op code. am: 64a408d87a am: 810e4d70c4
am: 5785fad952

Change-Id: Ib6bd338a800f3a3800440d5b77693ff52a752e80