Merge "Fix build" into mnc-dev am: af1e462b57
am: 54e3654d2d

Change-Id: I584c10b2acac459a86fb9349859f4b3cbc0697a3