Merge \\"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\\" into nyc-dev am: 7dbcfcadd5
am: 199e855f9f

Change-Id: I7a3f484d68b1c79e2fa9905b1283411220134fee