Merge 4223a2d775bf44afa5955ebc86192ccd2eca7412 on remote branch

Change-Id: If4919c19824efb9e6071419492a3c54d1716f509
tree: 82c3d9c7cc745e0561ee2ebea2b8970c7ed0c34f
  1. fwk-detect/
  2. HeadlessLauncher/