Merge "Replaces all tap code with new simple onTap()." into oc-mr1-dev
am: ed0f1ed2a4

Change-Id: Ife6b7e772c65370c09916c6d60ea7a4684a776ae