Merge "Fix usage of () and []."
am: 4c29be9a01

Change-Id: I47184e77d5b5e512a136d501f589e54f96609291