Merge dd6aaa6568ece1f2bd042a5b64cf1593dc50bf92 on remote branch

Change-Id: I4486991922be29f6dbae5427825a9e1553dcefec
tree: 5099ec564b654c20c796dd1aa52a70af167825bd
  1. conf/
  2. recipes/