Merge changes from topic "oth-b123003088"
am: 9d94a8566f

Change-Id: If0308e704ea03dca0c14580f6776b6057b705e51