This reverts commit 1190897038. Reason for revert: Resolved in I3a6d8a1486558db1622c2c447256024eed8773ae & Ia119414d2aa417215fbc9bdefe69ee5771860d23 Change-Id: Ib010e5bda4b240dfa5616722ae139774c4d4fc68
1190897038