This reverts commit 54c2fe240a. Change-Id: Ic0028674e4728b951215bf7b4d9a7535b8b49efe CRs-Fixed: 3523826
54c2fe240a