This compiles the changes we made during newton-3 phase. Change-Id: Ie885286398c71e89a74f445debd379ad0b5487c5