Update from Slimgapps build 4.6

Change-Id: I884036fdcfdfafdb972ef77cb3d2e55b793718f4