Merge "Merge "Make settings cahches generation mechanism robust." into nyc-dev am: b35301e421 am: 1ba77621c6" into nyc-mr1-dev-plus-aosp
am: f6ecb96a08
* commit 'f6ecb96a0806859c30470d7bfea8164fb86b1e15':
Change-Id: Ic3d4c1c89e5879fd88c52b8400470e25c2819774
This commit is contained in: