c8b8c91ecf
Reason for revert: venus was not released for yoga and thus isn't available for this branch Fixed merge conflicts introduced by [0] and [1]. This reverts commit 3d51f064646940ce5034489238120ab2a6752879. [0] I8bdce3b76bc02fdcc029f90cf1984e6b3d4eb961 [1] I4fff070ffef0a10887e1f26809bb43d20f48ea35 Change-Id: Ic298608c5711916942c1001a4c1530c4d15912ef