Merge changes from topic "frontend" am: 6494b4c9a6 am: 3c2d9e1fb6 am: 95323a806a
am: 91620ba0b8

Change-Id: I6188e56c977f9d56dafbce0968a3a65380e67995