Fix-up for I12c6a042d

Change-Id: I53840697d32b446d250699f41a73ec5baa4c39ff
Merge "Fix-up for I12c6a042d" into production