Merge "Handle overrideSourcePosition in unsupportedappusageprocessor." am: 168c609085
am: be7b380039

Change-Id: I63ed4728cc06f4799544a709841f6cfab38085c1