dd176e65e3
This reverts commit 663759e444.
Reason for revert: Temporary revert for NL build
Change-Id: I8614ee348e6e9290c0de0dfdf3e24663f220e356