Enforce calling identity before clearing. am: 7c1af8c62c am: 47dcd095ea
Jeff Sharkey [Fri, 16 Sep 2016 22:05:51 +0000 (22:05 +0000)]
am: 51033d49f6

Change-Id: Ic319b5f1f9351a83a2fde49aedc99f996fda8ef5


Trivial merge