am d4249251: Merge "Limit RemoteControlClient generation ID changes" into klp-dev

* commit 'd4249251e0a707d4fbc617b7556cb4c8c5163132':
  Limit RemoteControlClient generation ID changes