Merge "Merge "Fixed calls to update() when configuration changed." into nyc-dev am: f4f2211b13
am: 312ecda0ec" into nyc-mr1-dev-plus-aosp
am: 1e1a082e73
* commit '1e1a082e73e586d075c0684ed43381702f64242f':
Change-Id: I57297101a89213b23c0866b019943099c2af4041
This commit is contained in: