Merge branch 'origin/gaborone' into gaborone+

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

00:03:33

passed #3601
doxygen

00:01:06

passed #3598
Linux_Secured_Test

00:04:49

passed #3599
Linux_Unsecured_Test

00:03:44