The fix for b/29043547 has been submitted. Bug: 28769520 This reverts commit cc98f634. Change-Id: I6ed511c0024ecaee75740e2847d1be20c4fb07dd