Solved p12 \o/
Started p17

Change-Id: I442aeb4455a85b6e5c4bfa7893974c6c67231017