Merge "Test remotely initiated rekey" am: 06c7ebc8e4

Change-Id: I66fb5bef06774faf333fbfa6e6ed86cd1e662155