This is to follow naming from keymaster_defs.h Bug: 18088752 Change-Id: If2bc91dde54f1cefcd4325d1f62d0e0b77fc5d59