(cherry picked from commit 572a3df7fc) Bug: 36598475 Test: Verified the property value on the device Merged-In: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3 Change-Id: I8afcffcb7064ff6a3b97c26ee18aa22f969ffef3
572a3df7fc