Fixes: 130756217 Test: See comment #3 in the bug above Change-Id: I0008f2b2958c9ac0df4e1f8ce4f5edcd9aac4292