Updates from .20 ROM

Change-Id: I97eb188d452f85bed793074e0d0e36da2ad55b65