Merge changes from topic "property-handle" am: 54543bb423 am: 1077797c14
am: d5e5232632

Change-Id: I23a5fe95b271a50d60546231a9facf59440bb2dd