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

Change-Id: I7e3fc6ae23f15b69860965678eaa788e3c75add1