Merge "Changes based on API council feedback for performContextClick" into...
Merge "Changes based on API council feedback for performContextClick" into nyc-dev am: 7c17e70f am: 3425c6c6
am: b163f82e
* commit 'b163f82e':
Change-Id: Ie691c339d8035db4f6ff1e94bccc258fac72d5ec