Merge changes from topic 'background_inflation' into oc-dev am: 03fbdbe6ff
am: cc360f9b69

Change-Id: I456f81ff6300792e8639733d0115d878683d1694