- Update from android studio upgrade

Change-Id: Ifb482c370bcd1535c4321aa12f0ab231ccae5250