followup Ibb454f8883bfa8

must have been caught in the rebasing

Change-Id: Ib729d4975589f67333a30541aa9fbd59ec09c347
Merge "followup Ibb454f8883bfa8" into production