Merge "Fix issues 3425035 and 3423785." into honeycomb