[automerger skipped] Merge "Cache PM data in DPGP" into rvc-dev am: 371634f4...
[automerger skipped] Merge "Cache PM data in DPGP" into rvc-dev am: 371634f4 am: 46d2d86b -s ours am: feac8b54 -s ours
am skip reason: Change-Id If77214a193a39fec2f311a3aea324ef07c2dfb42 with SHA-1 be11ab63 is in history
Change-Id: I7939c3ec64a89f6b4b37b23cd51bd9b6245aed07