Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev
am: 33001945a8

* commit '33001945a82ba8cd5b5ad27b808312aa2ef210af':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on