Sync from bionic Change-Id: Ic2b5f1cf87c4c89f75571f76b6a078990bfcb1e4 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>