2ec4482fc7
Merge 2 meta patches as the first meta patch is just overwritted by second one. Build pass! Story: 2003768 Task: 28458 Change-Id: I02ccadafa5381c82bcace340f6c399af38aeecc7 Signed-off-by: zhipengl <zhipengs.liu@intel.com>