Merge from master

Change-Id: I27f20b0f86cc964b6efe0a99e37798bb53737049
tree: 75311511e0524b49fca5c355e89267358e6ebba6
  1. default.xml