Merge latest prototype changes into keyguard

Change-Id: Ibec6e9a7667ec730a25a58226c3203332af64b24
30 files changed