Merge branch 'gaborone+' into hollywood

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

00:03:03

passed #3769
doxygen

00:00:59

passed #3766
Linux_Secured_Test

00:04:31

passed #3767
Linux_Unsecured_Test

00:03:12