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

Change-Id: I3ebc17d016e16713c3913aecbe056f0d2a824970