Merge "Reminder to freeze keymaster at version "5"" am: a634e859df

Change-Id: Ia94b01bd19af655b7e2432e38cba3fc5bedfd6dc