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

Change-Id: I565376e4dda0297ba53ce7f4418d1b7fc685a600