By-passing the failure due to bug 1362020

Change-Id: I46aa3e445d0453a8a034cd86825e6745340d370e
Merge "By-passing the failure due to bug 1362020"