Merge "Fix docs comment for ACTION_SECRET_CODE" am: 608fa51d55
am: cd8462408a

Change-Id: Ie7d99c55e5b08b62c5a2eaa765b4d84e6bcf3db4