Merge "Merge "Change custom_link_attributes to path_attributes format." into mnc-mr-docs am: 14fd7d5 am: 5b4f351 am: 26d957c am: 72403f1 am: 5d5d956297" into nyc-mr1-dev-plus-aosp
am: 5b3740a38b

* commit '5b3740a38b664156b9b504a7dc9563b7df0bd67b':

Change-Id: Iabaf185dc7bae5e566d7658e9de965ce016d0817