Awkward cherry-picked

Change-Id: I739d247a2e6337aa1fa865a0721ada22ba7cec4d