Live hacks to patch set 14

Change-Id: I80bf6bbe4b8bf5b081c57e8cc09a32947a0eb748