Merge "Remove workaround for bug in MH.asType()" am: 363dc35ec7 am: 752c73b6ae
am: 0496650b8a

Change-Id: I12dfa78ef5b965e4651cecb9bec0de82f616d97e