Merge "Don't show unset score values for AccessPoints." into oc-dev
am: 32c65fccaf

Change-Id: I40586bcf4ab1fc32a15c145798460008ded764d1