Basic preparation for 4.2

Change-Id: Ife498c437041516ef494b56b7832c11fdb3e80e3