Fix missed lines in cherry pick @codefireX

Change-Id: I33db9a25ed17eb748a2f33545b5c62176bb169e0