Follow up patch on I1d243a20151827a35aed465061befbcf65f96474 Change-Id: I1d4c87584db638e1652df7b4d5c75d7fe2787269