DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
am: b0b583a1 -s ours
* commit 'b0b583a1':
DO NOT MERGE ANYWHERE Restart failed system calls interrupted with errno of EINTR
Change-Id: I982345259966a2d7108a6a9699b3f71cb6d2e26f