Merge "LayerStats: some changes for referencings" into pi-dev
am: d8f4d42019

Change-Id: I7474622b135f1b4b61f822ce74cbf67fe07f8214