Merge "Fix a bug in getprop return value check am: 11e4bc742b am: 0a4c664842" into oc-dr1-dev-plus-aosp
am: 9e68244205

Change-Id: Ia2bca6600789dc637b8d271f597725bc0e652ab0