Merge commit '2111be3f9c1059222c08814e81de6ab55be222c0' * commit '2111be3f9c1059222c08814e81de6ab55be222c0': Increase the default wake lock timeout.
Merge commit '2111be3f9c1059222c08814e81de6ab55be222c0' * commit '2111be3f9c1059222c08814e81de6ab55be222c0': Increase the default wake lock timeout.