Merge "Fix NPE with disabled overflow." into rvc-dev am: 25eee749 am: ef4ea6db am: ab9647e8 am: 5efe5aa9 Change-Id: Ia1644b74f79f1130d777468e01a4ab32b97b34f2