Merge "Add documentation for Locked Messages" am: 3e85da2d89
am: 332f0a4ae8

Change-Id: I44092dddb460050a7598ed00f14154d534a98f51