(partial revert of commit 7348f744) Bug: 15725449 Change-Id: Ic1a038c906deab035f96caed42fc16c59d459965
Bug: 15725449 Change-Id: I8c1033b24a50a61185d042bd6d214d7a3407ccbe