Merge "Revert "Fixing default behavior for keys requiring auth"" into rvc-dev am: 291718cdb7

Change-Id: Ib74a97237678f85fa78eac2d5f44cb23d80ab959