phab handle cherry-pick for T1343

Change-Id: I73653c4317a6911d4fdcfdfaf45cae80db5b033c