53daa2cae8
This reverts commit d46e428706.
Reason for revert: Temporary revert for NL build
Change-Id: I0bb46d0fc56a12c642a0ea8610e7a86002a21ada