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

Change-Id: Ibf6b77fae613c255dbd85ff3b565d79bcd5f04bb