Merge \\"docs: work - Managed configuration bundles am: ef574981 am: ba633fc9\\" into nyc-dev am: 7dbcfcad am: 4f93fdb9 Change-Id: I41fb264f3388716fb4ec08c058f2210752611228