[automerger skipped] Merge "Change property_contexts from private to public." into rvc-dev am: 893f7e67e0
-s ours am: f8fbf71ac2
-s ours
am skip reason: Change-Id I81a0e21a989dd89f8c37adf5a5c739ca0bdfbac0 with SHA-1 a07eaa4eec
is in history
Change-Id: If662d5e86d6facab756425c17363368ed991da5f
This commit is contained in:
commit
637c5eb14f