Merge 'origin/gaborone' into gaborone+

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
4 jobs for gaborone+ in 5 minutes and 36 seconds (queued for 5 minutes and 46 seconds)
Status Job ID Name Coverage
  Build
passed #3572
Android_build

00:03:31

passed #3573
doxygen

00:00:57

passed #3570
Linux_Secured_Test

00:04:59

passed #3571
Linux_Unsecured_Test

00:03:36