Merge "Update plugin for cas@1.2" am: e4ff5510d9
am: d47413ce9d

Change-Id: I42d1788439d7cb0490225d45987af65decd2e9c0