This reverts commit f9879fbf. Reason for revert: build_test (linux) build 4607115 in git_master is broken. Change-Id: I8249d188cc3e3c464c34f9b3a0d878c763d1fa5a