Update new branch

Change-Id: Iff1e348c22a04f1fedab4ccc145882dc17400311