modifications for 4.3

Change-Id: I80f530bd84461567450915648ec5fe0826b9a39d