This reverts commit 43c02b27cd. Test: mma Change-Id: I6b22ead8a4b964973ee2fdb8deba42bea74880cf
43c02b27cd