Merge "Replace identifer with identifier" am: d3c481cd26
am: 6fcc643373

Change-Id: Idf9d0f7b004fd697578a2b2800eeea30e15987d5