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

Change-Id: I6a47402a1cd823d493749e3b6580ba3a69fa49d9