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

Change-Id: I7e47fe571f2be140a76437c30b44e74619840d32