Merge "Hal Manifest: remove obsolete TODO."
am: e450187026

Change-Id: I8e5c4900372f05eec9ba969ae8e36b0317f734b0