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

Change-Id: I7e8d9ec7d140a0fcad7bfb82f1182dc43cdbe61a