Merge "Lock targetSdkVersion to 25" am: 7d9d3247e3 am: c48d64cfef
am: 9d166fcadf

Change-Id: Ic37ffd44261d4058b95aa6ee3cec1414f1e1473c