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

Change-Id: I60f9507af1c968c92cb55c37bfe8e49192d0827d