Update many speacil cases // Device maintainers you should be doing this!

Change-Id: I0929451bcaadcde8b4e344513f6eaf53f375bc24