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

Change-Id: Id3e127d607eb535d89dcfb7c1b0b328aef13b37f