Merge changes from topic "frontend"
am: 6494b4c9a6

Change-Id: I39bdb3fdfb65c63d5fdaba5a56691a3f8e5e49cb