Merge "Activate HMAC sharing check." into pi-dev am: c2ac8a636e
am: e433a1b7ae

Change-Id: Ic2730b4c222fdf69e27a1fbee728f677cee68c02