Merge "Fix build" into mnc-dev am: af1e462b57 am: 54e3654d2d am: 1627c7272f
am: 809ce83ef9

Change-Id: I278ab8e1229495f17e0f98e5b303b00cbc897077