Merge "Version adaptive icon to v26"
am: d0afb22efb

Change-Id: I695cb760ca34f13b16851fdbd8eac71ad3b75dde