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

Change-Id: I3accd507a8ea66a9868931a09b068628942183c6