Merge "Replace identifer with identifier"
am: d3c481cd26

Change-Id: I271c7e21e495c303d254501ea1803af15c6b222f