[automerger] Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into klp-modular-dev am: 47da6c0b7e am: bc09b59061 am: ff9c5ad85f am: 31199e5d39 am: 7db07c6af2

Change-Id: I74e32ac4f04c5729613961aecc900c5f612935e7