Merge "Fix compile issue" am: 27b56eb03f am: 60c65f1a67
am: 11d331a2af

Change-Id: I6f293b65cfc734beeafc510baa7121945de208e4