Merge "Change property_contexts from private to public." into rvc-d1-dev am: a83114be2d

Change-Id: Ie3f99cf4fccd6807c638cbb70ebd7a8510991dd3