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