Merge "Remove restriction that limits updateConfiguration API to Auto"