Fix bad merge of I1e131a

Change-Id: Icf8debad7926b880f28c091919e1626772afb3d6
Merge "Fix bad merge of I1e131a"