Merge "camera2: Get rid of annoying "Reading a NULL string...." error message" into klp-dev