Merge "Fix path for default prop"
am: 3c2c9d8d43

Change-Id: I9ceb4b7a02fcfd869aab0c28545bfb9d31ebb683