Merge "Lock targetSdkVersion to 25"
am: 7d9d3247e3

Change-Id: I7b168b9a49ac6e8ad0e67fc617b841ab308d8fde