Catch up to TDE and OS changes Signed-off-by: OBATA Akio <obache@wizdas.com> (cherry picked from commit 2a88ec3c02)
2a88ec3c02