Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev
am: c816320161

Change-Id: I36ce4c76617592d574def6873645be1f95df1426