Merge changes from topic "frontend" am: 6494b4c9a6
am: 3c2d9e1fb6

Change-Id: I19fb432c4a724ced8526866e1838c8f18c481ae8