Remerge all our old features which matches new 4.3 Phone

Change-Id: Ie3d94324c95c489314d862c8d7ad71713ef35e11