Merge "Fix mismatched-tags error" am: 604224ed40 am: 004ac55aef
am: 9d64132b04

Change-Id: I37563d77d2eaf6db5d1c5b579ad1f930f2d8f1e1