Updates from stock recovery

Change-Id: Ic51e309ddd24e22344a73a7a87e7c4100cd238e2