Merge "Fix compile issue"
am: 27b56eb03f

Change-Id: I052fdfdc4f3a75f9ddaa6e9e445d706e22574113