Do not use hidden withCleanCallingIdentity am: 7998fbc67e

Change-Id: I3c1d6312baf5d9011a28b1f0eefe916427b85035