Merge "Hal Manifest: remove obsolete TODO." am: e450187026 am: 371ec41897
am: 57f65dc374

Change-Id: I74fc3aba5c7e7c72334082d1ff9bd552b4184a65