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

Change-Id: I4093508e56416d815fb12914aa2b41e1da152b7c