cherrypick from hc-mr2 Change-Id: I00903a5b3a3d91c0751334e3314acf19a3d498d4

Change-Id: I19ed647790ed4781762f09897ec76a4348059fb2
1 file changed