Merge "Prevent busy loop"
am: 65dda082a1

Change-Id: Ibf1d033bef9e001a7b66dcdfa4b587801b3e09ca