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

Change-Id: I05d1a54032c456b9e07674199e334a4d483298f2