Merge "Introduce early exit path for non resource path." into oc-dev
am: 01d5b3d2af

Change-Id: I07120a86307dd397862e0d341763d0048b066845