Merge "Update CachedProperty to support long ro. properties" am: 701981a8 am: 7777053f am: 0d1305d5 am: 4e7a7da5 Change-Id: Iaf62eed187da65e224178239b14d01f36e410e4d