Merge "Improve the logic to determine the idle mode"
am: 72baed4afd

Change-Id: I2df0c4df166f0056f46cf6528e81059e07aedfc6