Merge "Change warning logic in preopt2cachename"
am: 1149338ad7

Change-Id: Iffe8c73a6e6c23873e6c790589ee8969a1d5e0f4