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

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