Merge "Remove calls to VMRuntime methods that are no-ops." am: ca1c6419c3
am: 81a8cdef87

Change-Id: I753a32738fae8186d0dcb720999e88cdab4aed7b