This reverts commit d56ce000. This revert is to fix the wembley build. Test: Local wembley build Change-Id: I651f20ffc6ba11cced5a2a737fd3d77211127221