Fix build break

Change-Id: I105094ead7e3247408389dcfbe196c7aae5a11d9
Merge "Fix build break" into R1.06