Trip's squashed commits

Change-Id: I0ae0d1a005b8d9be5801af5635935fb70228cf87
Merge "Trip's squashed commits" into jb-mr2