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

Change-Id: I8484b96c71aff5d05befa9e64093868a61436fbe