[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 am: 5b29a62dd4 am: 588b07d6c1 am: 7a8375b06d am: a8841c6b0a

Change-Id: I18bb134bb4e577a572a7716d34941d50b073c34d