Merge commit '7d181ba6ae8cae59b748bc9adfb919a6f3aec473' into patch_branch

Change-Id: Ibe33555e903e0e0a3ac5668eda2e20f683624fa9
tree: 9fde3790f7818caf38ea1baff22ada6a9cf7a0f7
  1. bar
  2. baz
  3. branchline
  4. chump
  5. COMMIT-QUEUE.ini
  6. randomfile