fix after merge

Change-Id: Ib59487f5d8e0820930f1132e13acfeda9c1b2681