am 604019c8: Merge "Fix build." into ics-mr1 am: 2511c7a555

Original change: undetermined

Change-Id: Id6e1101b177c8cbef9635c16da9241bc89ba4390