Merge branch 'gaborone+' into hollywood

Signed-off-by: Kishen Maloor <kishen.maloor@intel.com>
4 jobs for master in 4 minutes and 38 seconds (queued for 15 minutes and 28 seconds)
latest
Status Job ID Name Coverage
  Build
passed #3892
Android_build

00:02:52

passed #3893
doxygen

00:00:38

passed #3890
Linux_Secured_Test

00:04:05

passed #3891
Linux_Unsecured_Test

00:02:56