[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: 421cc73c am: 0b4f4fac am: 71b485f3 -s ours
am skip reason: Change-Id If77214a193a39fec2f311a3aea324ef07c2dfb42 with SHA-1 18de7e92 is in history
Change-Id: I9650d123ddac504682436c23ff2ad057e17a99ad