Merge "Bug fix: add condition back"
am: 5503d264ac

Change-Id: I581d836d713817acb066a29e525c778c8e975ef7