Merge "Fix NPE with disabled overflow." into rvc-dev am: 25eee749 am: ef4ea6db am: 8bb72274 am: 5acb7a4f am: 55cb2224 Change-Id: Ib186ebc887156ef1c380311c1f65cbca8b869714