This reverts commit 7a5ca9982f. Depends: Ia4fa5046b3106e2710b9d5df1a6cc5f2cf995ec7 Change-Id: I0b9d0125380efe898943dc26ae884378145c44a3
7a5ca9982f