[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 am: 3fbc42577f

Change-Id: Ib2f41678a66afb5b09a4e4beae7baef7e1c7b508