Merge branch 'origin/gaborone+' into hollywood

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
5 jobs for 2.2.0-RC0 in 7 minutes and 55 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build
passed #3487
Android_build

00:04:27

passed #3486
doxygen

00:01:09

passed #3483
Linux_Secured_Test

00:03:28

passed #3484
Linux_Unsecured_Test

00:01:00

passed #3485
Android_build

00:06:19