Merge branch 'origin/master' into ocfbridging

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
4 jobs for ocfbridging in 10 minutes (queued for 21 minutes and 21 seconds)
Status Job ID Name Coverage
  Build
passed #3326
Android_build

00:06:34

passed #3327
doxygen

00:01:09

passed #3324
Linux_Secured_Test

00:04:14

passed #3325
Linux_Unsecured_Test

00:03:22