Add shadow for PersistentDataBlockManager am: 8b93ba7471 am: 60aba8d30d

Change-Id: I81c5325b4e0c562678c780294d116b681a81bbe4