Patch for bionic
Merge branch 'master' of https://github.com/GeeteshK/caf-patches