Merge "android change to handle Change-Id: Idbeed81b5b7349059e467b33a8641abf0b4aaeff"