[automerger skipped] Disabling alpha layer on some views skipped: de967a2355

Change-Id: Id15176879b3a248047c50eb31979b54aedd71cad