bug/1272748 likely, still broken

Change-Id: I91d2891f995e0410b732cfe145e504e759aed352