Merge "Make NativePattern.address field private"
am: 3c4ad627e5

Change-Id: Ic225028215ead5c8f441893274cf5d346eea0902