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

Change-Id: I8ee620ac2fec24c56a40f2b9be1aa0665a0146bf