bug:20948129 This reverts commit 58fc522a69. Change-Id: Iddeccb4ad15b843bb3e610bd3673a0c7abc1bf46
58fc522a69